Sync'd branch integration/b2g-inbound with upstream @ Sat Sep  6 11:28:37 PDT 2014