Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 19 17:01:42 PDT 2014