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