Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 11:49:48 PDT 2014