Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 10:41:39 PDT 2014