Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 12:38:45 PDT 2014