Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 08:38:38 PDT 2014