Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 13 10:18:40 PDT 2014