Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 19 14:38:43 PDT 2014