Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 11:28:21 PDT 2014