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